General: renaming layout file to match it's fragment class
General: Fixing references