UI improvements and cleanup