Layout changes and some other stuff

You can merge this