Absolutely new code for top menu + small bugs