fix spacing & alignment