Changed the layout a bit so it looks better