Mobile form fixing

Resolving some of #8