Bug fixes & design improvements