Added some adjustments to fit material design