* Minor rearrangement of layout for better readability