Added unit test
Added UI