Merge "Moves layout code from java files to layout xml"