Interface changes completed

Awaiting final tweaks. UI should be done after that,