Layout updated to new design