updated header, fixed layout