Edited the layout a bit