Re-done css styles - v2