Added menu, user/currency selection, new classes