Bug fixes & common components update