[DASHBOARD] More work and samples
[FIX] Merge conflict, proper CSS fix