Improve Config Layout