Fixed fragment inflation error

Still need to fix button overlay, but getting there
Steven needs to commit button changes soon! (Otherwise our branching is
going to be too big)