Added new functions. Moved the menu a bit.