Revamped UI, added functionality