Fixed layering and a handful of other parts to the UI