Removed CDI event todos as they would not be working here
Simplified mockup generator
Code cleanup
Added some styling to presentation form