major UI improvements