Changed layout to more modern look