Updated UI

improvements (espec. for mobile)
merge