Lots of code cleanup + made forms mobile friendly