GEC added, layout updates 2