GEC added, layout updates