Improve some layer ordering