Fixed ugly fix for centering
Merged and whatnot
Okay, really fixed it this time :-|