second menu added plus some fixes in layout