Updated UI and code. Small fixes