Architecture Changes

Updated architecture to make use of Fragments for user added content.