updated layout names and uncommented most code