Minor Polishing

Changed some screens around