Redesigned and moved counting hours and counting activity groups
Added issue #12
Modified but probably not fixed issue #11 also #2