just refigured my database
Fixed header
merges Jake's changes