settings fix
layout updates