Updated layout, removed redundant extras