did more refactoring. updated styles