- Final layout fixes.
- Minor code cleaning.