States properly set up. Menu made slightly prettier.