Initial work for v3.0.0

Reworking layout and updating visuals