re-aranged some elemets to look neater.