margin fixes and alignment issues