Updates for basic styles and front end routing ... again
Merge remote-tracking branch 'origin/master'