Changed layout to a simpler one