Pretty up manual form

Plus fixing Travis for the 3rd time!