Change to fragments to enable swiping.
Major rewrite
Merge remote-tracking branch 'origin/master'