Updated layout to look nicer