Fixed some layering issues