Code structure changed and input style changed