Removed item and task tabs and added to entry.
Updated all includes for new paths.