updated for material design and fixed layout issues