Switched to using forms for UI