Redone #265 using a seperate activity in combination with tabs and fragments