Front page & Layout fixes