Add crop image activity and make some minor UI changes