Finished overhaul, excl vulnerability and screenshots

See rendered file for yellow todo blocks