fixes. started to work on the layout