Feature/material design

Updates with latest changes