Added some fields to main screen