UI updates
got rid of old code