DA-39: Rearranged the screen's layout to provide consistency per review.