bug & UI fixes
Merge pull request #2 from psasapps/dev

bug & UI fixes