header styling
merge conflicts
added state dropdown
merge conflicts