Adding trip form and improving UI