Clean

Cleaned application, added generic tag library