Updated the setup screen components, but are still incomplete