cleaned up entry click event

no more redundant code
if statements to switch + extra functions