Merge pull request #45 from shidel-dev/ux_improvements

Ux improvements
Merge pull request #46 from shidel-dev/ux_improvements

Ux improvements
change to php, update navbar to rails-convention links