Basic layout complete. Dead code removed.