Minor bugs in the layout