Redesigned the input components