Some changes to UI, get rid of scary functions