restricted working + UI fixes
Merge pull request #7 from jtkyeung/JessBranch6

restricted working + UI fixes