more transition fixes, shuffled/refactored some other CSS