Minor fixes and added stacks to menu