Updated to 1.1

Shortened most overlong methods, split custom tags into view and control
tags. (Didn't have time to test everything yet, but should work, as most
of the code already existed and I only moved them around)