Improvments to the Layout