Resolved errors and more CSS changes