improved ui
cleanded up code