Started rewriting menu component