Added couple of new screens

Also, implemented the enhancement for issue #1