More last minute changes and UI fixes.