organize components a bit