Minor Updates to layouts