Redo UI using bootstrap theme to help speed things along.
Merge commit '12a8ddee5403c5491ab9d5236815cfbf6a4f6d09'