Some todos and changes to admin tool styling.
Moved some logic to markupparser to prevent a bug.