Added menu, cleaned few things