fixing small component issues