Adjust MainActivity and Fix some UI bug