Fix layout & menu