Fixed sizing issues... Primer still to go :(