Merge pull request #340 from glee23/master

Some User side layout improvements
Merge branch 'master' of https://github.com/blasv/DineOn