Fixed inputs issues and saving glitch