All of the different sub-menus along with planned future sub-menus were convoluted. This should help make things better for the end user.