Change Settings layout, Fix controller layout, Add Client ID support.