UI Updates
ANTLR generation
Fix build