Changed some ordering in views