Changed UI, added better functionality