Adapted UI, working version