First commit to this branch

I have been changing the UI so it is more align to the upcoming Material Design.