Small improvements in layout
Finished little fixes