combined source and types pages, modified tab bar and other formatting