Better UI handling in Activity