major changes to ui layout