Revised entire layout with all changes implemented.