Updated for the new layout

Updated for the new layout, increased red line to 2 pixels and some small fixes.