Vita changes + small styling issues