Fixed some Problems

Menu is still broken.