major UI improvements: flat UI
fixed merge conflicts: flat UI