First step to material design
Little fixes and corrected actions.