Stop annoying animation, rework headers