Fixed minor bugs in previous commit.
Merge branch 'issue-58' of github.com:insignia4u/staffeye-fe into issue-58