Fixed all spacing issues [Ticket #6877]