Fix collapsed menu
Update layout