fixed up margin issues