Added screens presentation and some last minute UI changes