Merge "Fix menu styling" into lmp-dev