Fixed spacing issues and added override tags