Cleaning Code & Continuing UI improvements