Adjust layout and fix dropdown issue