Minor changes to if statements - still contains double clicking sign in bug