Simplified CSS for buttons, changed to use basic bootstrap btn class.
Merge remote-tracking branch 'origin/master'