Refactor continued. Menu seperated.