fixes JNAPC-267
Merge pull request #1342 from Tendrid/projects/jnap

fixes JNAPC-267
UI Clean up ticket stuff