fixed positions and added new event handlers