Refactored a bit, added context dialog for long press