minor adjustments + change to compose view