Fix buttons navigation + remove interruptions
