cleaned, updated layout