design updates and fixes