Edited layout; border-box, body size