Cleaned Code, Changed UI Scheme