Fix layout, finish input controller