Changing layouts and commenting out some light code