Layout - fix warnings
Begin conversion to Fragments