Add additional menu items and cleans up code.