Make UI better and things