Partial option menu implementation, minor ui changes, and various optimizations