Added a missing header
Removed extra line
layout adjustments
layout adjustments
fixed layout