Cleaned some code, added rough menu system