Fixed issues with margins