Various improvements + dark view