Includes some UI UX fixes