UI Overhaul and some fixes.