Changed layout to material design