Some UI Changes. Actually a lot of them...