Changed layout to be slightly cleaner