Theme fixes
Design fixes. Need to do that for lollipop