cleaned up base and menu slightly