Changed to used built in macro for enums
Added URL insertion support
Added simpleHTML api
Updated test controller