some more design tweaking