moving stuff around, looks better