After testing styling and bug fixes