Updated velocity UI and server side implementation