Minor gui and performance changes. Push before performance optimizations