added and tweaked layout