Updated look
Merge branch 'updatedLook'