Improved front layout