Changed layout and added styling