This activity needs to be in the manifest
some optimizations and a correction of a constant name