Revamped the UI