Clean up layout and text spacing
Adding self contained editor
Merged UI correction by Purencool