Improved buttons and implemented menu