Android improvements, and visual fix