Fix Android loggin, simplify settings