- More ditor fixes & UI