remake of report screen some, added password ok button
Merge remote branch 'origin/master'