Revamped UI, added user functionality