Reindenting
More work on dropdowns