started on some design-tweaks