Made stuff smaller, fits nicer now
More progress, getting there