fixing some design based on drews input