Added menu and some structure