CSS clean-up.
Code clean-up.
Code clean-up.
Code clean-up.
Merge fix.