Changes to make sure material design UI still looks good on pre Android L devices, general refactoring and cleanup