Completed the UI
Fixed tests