UI cleanup for tablets and phones