Improved dark layout