Fix ordering CSS along with some other CSS issues