Cleanup of placeholder apps
Usability fixes, fix for issue #56 and #58