Redesigned the UI
Updated code to fix merge conflicts