fixed some layout(3)
layout fixes and settings separation fixed