Forsa - Add code for UI and adding code for query