Add limited menu functionality, improve UI