Added UI and final tests