styling up the views
Pull from upstream.
styling buttons
Merge from upstream.
Merge in off-canv branch.
Fix merge conflicts.