minor Layout changes and some fixes