Fixes on GUI, Clean up and WIP create event