Some design tweaking