closes #84 (closed)
does not look very nice but this will be all changed when we deal with the layout