Re-bootstrap and layout