Fixed tabs/spacing issues