Some slight changes.
Further finetune to the layout