Fixed logo, fixed form columns, fixed buttons, updated bar-order