small changes
more improvements on the layout