Fixed logic errors and added new UI arrows