Renamed activity_empty to empty_layout, modified overlay counter bug fix needed