Refactoring to avoid nested fragments.
Added some bad style, but using as workaround to avoid nested fragments
Nested fragments caused a lot of issues (issue#15), so decided to do
away with it.