pulled in latest screen

also- keep the padding bottom out