Fix some small screen problems