Updated design. Implemented menu