Fixed some layout formatting
Fixed bug on extra tests
Add options for editor