Additions to Test App
Edited UI's