Switch to using fragments