Updated to more material design. Refactored Code