Adjust layout and clean admin options page