fix non-expanding inputs and removed margin