A bit more changes on layout